From d198d00e117aec70f886989da6383c8dad45e9ff Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Fri, 28 Jul 2017 12:09:22 -0700 Subject: [PATCH] RCFilters: Remove $wgStructuredChangeFiltersEnableSaving feature flag It's set to true now, and the feature is mature enough that we don't need it to be feature-flagged anymore. Change-Id: I9202b7ee2f9ff80106d1fb4d3e6cddec04c8b4ac --- includes/DefaultSettings.php | 5 -- .../mw.rcfilters.Controller.js | 4 +- ...rcfilters.ui.FilterTagMultiselectWidget.js | 60 ++++++++----------- .../ui/mw.rcfilters.ui.FilterWrapperWidget.js | 24 ++++---- 4 files changed, 38 insertions(+), 55 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 77d7b0e52a..aa4320db35 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -6769,11 +6769,6 @@ $wgRCWatchCategoryMembership = false; */ $wgUseRCPatrol = true; -/** - * Whether to allow users to save their RecentChanges filters - */ -$wgStructuredChangeFiltersEnableSaving = true; - /** * Whether to show the new experimental views (like namespaces, tags, and users) in * RecentChanges filters diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index 73ff165a78..10ef6b2919 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js @@ -856,9 +856,7 @@ savedHighlights = {}, defaultSavedQueryItem = this.savedQueriesModel.getItemByID( this.savedQueriesModel.getDefault() ); - if ( mw.config.get( 'wgStructuredChangeFiltersEnableSaving' ) && - defaultSavedQueryItem ) { - + if ( defaultSavedQueryItem ) { data = defaultSavedQueryItem.getData(); queryHighlights = data.highlights || {}; diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js index 89c6f271d3..934c7c48a7 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js @@ -15,7 +15,6 @@ */ mw.rcfilters.ui.FilterTagMultiselectWidget = function MwRcfiltersUiFilterTagMultiselectWidget( controller, model, savedQueriesModel, config ) { var rcFiltersRow, - areSavedQueriesEnabled = mw.config.get( 'wgStructuredChangeFiltersEnableSaving' ), title = new OO.ui.LabelWidget( { label: mw.msg( 'rcfilters-activefilters' ), classes: [ 'mw-rcfilters-ui-filterTagMultiselectWidget-wrapper-content-title' ] @@ -30,7 +29,6 @@ this.queriesModel = savedQueriesModel; this.$overlay = config.$overlay || this.$element; this.matchingQuery = null; - this.areSavedQueriesEnabled = areSavedQueriesEnabled; // Parent mw.rcfilters.ui.FilterTagMultiselectWidget.parent.call( this, $.extend( true, { @@ -86,19 +84,17 @@ classes: [ 'mw-rcfilters-ui-filterTagMultiselectWidget-resetButton' ] } ); - if ( areSavedQueriesEnabled ) { - this.saveQueryButton = new mw.rcfilters.ui.SaveFiltersPopupButtonWidget( - this.controller, - this.queriesModel - ); + this.saveQueryButton = new mw.rcfilters.ui.SaveFiltersPopupButtonWidget( + this.controller, + this.queriesModel + ); - this.saveQueryButton.$element.on( 'mousedown', function ( e ) { e.stopPropagation(); } ); + this.saveQueryButton.$element.on( 'mousedown', function ( e ) { e.stopPropagation(); } ); - this.saveQueryButton.connect( this, { - click: 'onSaveQueryButtonClick', - saveCurrent: 'setSavedQueryVisibility' - } ); - } + this.saveQueryButton.connect( this, { + click: 'onSaveQueryButtonClick', + saveCurrent: 'setSavedQueryVisibility' + } ); this.emptyFilterMessage = new OO.ui.LabelWidget( { label: mw.msg( 'rcfilters-empty-filter' ), @@ -132,14 +128,12 @@ .addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-cell-filters' ) ); - if ( areSavedQueriesEnabled ) { - rcFiltersRow.append( - $( '
' ) - .addClass( 'mw-rcfilters-ui-cell' ) - .addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-cell-save' ) - .append( this.saveQueryButton.$element ) - ); - } + rcFiltersRow.append( + $( '
' ) + .addClass( 'mw-rcfilters-ui-cell' ) + .addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-cell-save' ) + .append( this.saveQueryButton.$element ) + ); // Add a selector at the right of the input this.viewsSelectWidget = new OO.ui.ButtonSelectWidget( { @@ -372,21 +366,19 @@ * Set the visibility of the saved query button */ mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.setSavedQueryVisibility = function () { - if ( this.areSavedQueriesEnabled ) { - this.matchingQuery = this.controller.findQueryMatchingCurrentState(); + this.matchingQuery = this.controller.findQueryMatchingCurrentState(); - this.savedQueryTitle.setLabel( - this.matchingQuery ? this.matchingQuery.getLabel() : '' - ); - this.savedQueryTitle.toggle( !!this.matchingQuery ); - this.saveQueryButton.toggle( - !this.isEmpty() && - !this.matchingQuery - ); + this.savedQueryTitle.setLabel( + this.matchingQuery ? this.matchingQuery.getLabel() : '' + ); + this.savedQueryTitle.toggle( !!this.matchingQuery ); + this.saveQueryButton.toggle( + !this.isEmpty() && + !this.matchingQuery + ); - if ( this.matchingQuery ) { - this.emphasize(); - } + if ( this.matchingQuery ) { + this.emphasize(); } }; diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js index a6b363d168..92d223c623 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js @@ -74,20 +74,18 @@ this.dateWidget.$element ); - if ( mw.config.get( 'wgStructuredChangeFiltersEnableSaving' ) ) { - this.savedLinksListWidget = new mw.rcfilters.ui.SavedLinksListWidget( - this.controller, - this.queriesModel, - { $overlay: this.$overlay } - ); + this.savedLinksListWidget = new mw.rcfilters.ui.SavedLinksListWidget( + this.controller, + this.queriesModel, + { $overlay: this.$overlay } + ); - $topRow.append( - $( '
' ) - .addClass( 'mw-rcfilters-ui-cell' ) - .addClass( 'mw-rcfilters-ui-filterWrapperWidget-top-savedLinks' ) - .append( this.savedLinksListWidget.$element ) - ); - } + $topRow.append( + $( '
' ) + .addClass( 'mw-rcfilters-ui-cell' ) + .addClass( 'mw-rcfilters-ui-filterWrapperWidget-top-savedLinks' ) + .append( this.savedLinksListWidget.$element ) + ); if ( mw.config.get( 'wgStructuredChangeFiltersEnableLiveUpdate' ) || -- 2.20.1